Merged
Conversation
…ng (#435) - 006: mark Resolved — CLI-spec parity check and framework command types merged via PR #432 - 040: mark Resolved — elegance-guidelines field added to agents.yaml via PR #432 - 025: mark Partially resolved — filterDomainsByStack() addresses noise; TRAE format audit outstanding - 026: mark In progress — kit filtering principle extends to skills; TRAE format audit pending - 027: mark Deferred — TRAE agent packaging/import format audit not yet started - 004: reduce priority P2 → P3 — domain filtering reduces governance urgency for rules.yaml Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
…as (#436) - .agentkit/package.json: name retort-runtime, add retort:* scripts (agentkit:* scripts kept as deprecated aliases for one release cycle) - package.json: name retort-root, add retort:* root scripts, ak:* scripts updated to call retort:* internally - cli.mjs: banner and log prefix updated to Retort/[retort:] - template-utils.mjs, synchronize.mjs: GENERATED header now reads "GENERATED by Retort" (validate.mjs accepts both old and new) - 124 template files: AgentKit Forge → Retort, agentkit:sync → retort:sync - 38 engine source files: AgentKit → Retort throughout - Test suite: all assertions updated (cli, sync-integration, template-utils, brand-resolver tests) Rationale: "agentkit" is a commodity name dominated by Anthropic's own AgentKit/Agent SDK tooling. "retort" is unique, distinctive, and aligns with the repo identity. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Mention Blocks like a regular teammate with your question or request: @blocks review this pull request Run |
Contributor
|
Important Review skippedToo many files! This PR contains 267 files, which is 117 over the limit of 150. ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: ⛔ Files ignored due to path filters (6)
📒 Files selected for processing (267)
You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR is primarily a repo-wide rebrand/migration from “AgentKit Forge” to “Retort”, updating package names, scripts, templates, and documentation references, plus adding status/resolution notes to several tracked issue docs. It also appears to accidentally commit local Claude worktree artifacts under .claude/worktrees/**.
Changes:
- Rename/rebrand strings and generated-file headers across templates and the Node engine (AgentKit Forge → Retort).
- Add/route
retort:*scripts (sync/init/validate/etc.) and update root-level scripts to use them. - Update several
.github/ISSUES/*.mdrecords with resolution/defer notes.
Reviewed changes
Copilot reviewed 265 out of 273 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
| package.json | Renames root package and switches build/utility scripts to retort:*. |
| .github/ISSUES/040-agents-should-consider-architectural-elegance.md | Adds “Resolved” status note and references implementation PR. |
| .github/ISSUES/027-trae-agents-revisit.md | Adds “Deferred” note and cross-references related work. |
| .github/ISSUES/026-trae-skills-revisit.md | Adds “In progress / follow-up needed” note referencing kit filtering follow-up. |
| .github/ISSUES/025-trae-rules-revisit.md | Adds “Partially resolved” note referencing domain filtering. |
| .github/ISSUES/006-reverse-spec-mismatch.md | Marks acceptance criteria complete and adds resolution summary. |
| .github/ISSUES/004-rules-yaml-ownership.md | Lowers priority and adds rationale note. |
| .claude/worktrees/tender-margulis/package-lock.json | Adds a worktree-local lockfile (likely unintended to commit). |
| .claude/worktrees/tender-margulis/.claude/state/tasks/task-p1-staging-env.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/tender-margulis/.claude/state/tasks/task-p1-migration-tooling.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/tender-margulis/.claude/state/tasks/task-p1-health-check.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/tender-margulis/.claude/state/tasks/task-p1-db-schema.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/tender-margulis/.claude/state/tasks/task-p1-api-routes.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/tender-margulis/.claude/state/tasks/task-p0-test-framework.json | Worktree-local task file present (content not shown in diff). |
| .claude/worktrees/tender-margulis/.claude/state/tasks/task-p0-ci-pipeline.json | Adds worktree-local task rejection snapshot. |
| .claude/worktrees/tender-margulis/.claude/state/orchestrator.json.template | Adds worktree-local orchestrator template snapshot. |
| .claude/worktrees/tender-margulis/.claude/state/orchestrator.json | Adds worktree-local orchestrator state snapshot. |
| .claude/worktrees/tender-margulis/.claude/settings.local.json | Adds worktree-local Claude permissions/config (likely unintended). |
| .claude/worktrees/tender-margulis/.agentkit/state/orchestrator.json.template | Adds worktree-local AgentKit/Retort state template snapshot. |
| .claude/worktrees/tender-margulis/.agentkit/logs/usage-2026-03-17.jsonl | Adds worktree-local usage logs (likely unintended). |
| .claude/worktrees/tender-margulis/.agentkit/logs/usage-2026-03-16.jsonl | Adds worktree-local usage logs (likely unintended). |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/scripts/validate-numbering.sh | Adds worktree-local scaffold cache content (likely unintended). |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/scripts/validate-documentation.sh | Adds worktree-local scaffold cache content (likely unintended). |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/scripts/analyze-agents.sh | Adds worktree-local scaffold cache content (likely unintended). |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/reference/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/README.md | Adds worktree-local scaffold cache docs hub. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/product/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/operations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/integrations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/history/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/history/migrations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/history/lessons-learned/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/history/issues/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/history/implementations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/history/features/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/history/bug-fixes/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/engineering/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/architecture/specs/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/architecture/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/architecture/diagrams/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/architecture/decisions/README.md | Adds worktree-local scaffold cache ADR index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/docs/api/README.md | Adds worktree-local scaffold cache API docs index. |
| .claude/worktrees/tender-margulis/.agentkit/.scaffold-cache/AGENT_TEAMS.md | Adds worktree-local scaffold cache team mapping file. |
| .claude/worktrees/focused-colden/package-lock.json | Adds a second worktree-local lockfile (likely unintended). |
| .claude/worktrees/focused-colden/.claude/state/tasks/task-p1-staging-env.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/focused-colden/.claude/state/tasks/task-p1-migration-tooling.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/focused-colden/.claude/state/tasks/task-p1-health-check.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/focused-colden/.claude/state/tasks/task-p1-db-schema.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/focused-colden/.claude/state/tasks/task-p1-api-routes.json | Adds worktree-local task state snapshot. |
| .claude/worktrees/focused-colden/.claude/state/tasks/task-p0-test-framework.json | Worktree-local task file present (content not shown in diff). |
| .claude/worktrees/focused-colden/.claude/state/tasks/task-p0-ci-pipeline.json | Adds worktree-local task rejection snapshot. |
| .claude/worktrees/focused-colden/.claude/state/schema.json | Adds worktree-local schema definition snapshot. |
| .claude/worktrees/focused-colden/.claude/state/orchestrator.json.template | Adds worktree-local orchestrator template snapshot. |
| .claude/worktrees/focused-colden/.claude/state/orchestrator.json | Adds worktree-local orchestrator state snapshot. |
| .claude/worktrees/focused-colden/.claude/settings.local.json | Adds worktree-local Claude permissions/config (likely unintended). |
| .claude/worktrees/focused-colden/.agentkit/state/orchestrator.json.template | Adds worktree-local AgentKit/Retort state template snapshot. |
| .claude/worktrees/focused-colden/.agentkit/logs/usage-2026-03-17.jsonl | Adds worktree-local usage logs (likely unintended). |
| .claude/worktrees/focused-colden/.agentkit/logs/usage-2026-03-16.jsonl | Adds worktree-local usage logs (likely unintended). |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/scripts/validate-numbering.sh | Adds worktree-local scaffold cache content (likely unintended). |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/scripts/validate-documentation.sh | Adds worktree-local scaffold cache content (likely unintended). |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/scripts/analyze-agents.sh | Adds worktree-local scaffold cache content (likely unintended). |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/reference/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/README.md | Adds worktree-local scaffold cache docs hub. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/product/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/operations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/integrations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/history/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/history/migrations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/history/lessons-learned/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/history/issues/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/history/implementations/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/history/features/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/history/bug-fixes/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/engineering/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/architecture/specs/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/architecture/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/architecture/diagrams/README.md | Adds worktree-local scaffold cache docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/architecture/decisions/README.md | Adds worktree-local scaffold cache ADR index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/docs/api/README.md | Adds worktree-local scaffold cache API docs index. |
| .claude/worktrees/focused-colden/.agentkit/.scaffold-cache/AGENT_TEAMS.md | Adds worktree-local scaffold cache team mapping file. |
| .agentkit/templates/windsurf/teams/TEMPLATE.md | Updates generated-file guidance to Retort branding and retort:sync. |
| .agentkit/templates/windsurf/rules/project.md | Updates framework name and generated-file guidance to Retort. |
| .agentkit/templates/scripts/setup-agentkit-branch-governance.sh | Renames printed banner to Retort. |
| .agentkit/templates/scripts/setup-agentkit-branch-governance.ps1 | Renames printed banner to Retort. |
| .agentkit/templates/scripts/resolve-merge.sh | Updates merge-resolution wording to Retort. |
| .agentkit/templates/scripts/resolve-merge.ps1 | Updates merge-resolution wording to Retort. |
| .agentkit/templates/scripts/consolidate-branches.ps1 | Updates merge-resolution wording and sync command to Retort. |
| .agentkit/templates/root/UNIFIED_AGENT_TEAMS.md | Updates generated header + sync command wording to Retort. |
| .agentkit/templates/root/SECURITY.md | Updates wording and regenerate command to Retort. |
| .agentkit/templates/root/RUNBOOK_AI.md | Updates CLI command names and regenerate command to Retort. |
| .agentkit/templates/root/QUALITY_GATES.md | Updates generated header/branding to Retort. |
| .agentkit/templates/root/MIGRATIONS.md | Updates migration guide wording/commands to Retort. |
| .agentkit/templates/root/CONTRIBUTING.md | Updates contributor instructions to retort sync/validate. |
| .agentkit/templates/root/COMMAND_GUIDE.md | Updates “AgentKit” references to “Retort”. |
| .agentkit/templates/root/CHANGELOG.md | Updates changelog wording/branding to Retort. |
| .agentkit/templates/root/AGENT_TEAMS.md | Updates team mapping description to Retort. |
| .agentkit/templates/root/AGENT_BACKLOG.md | Updates generated header/footer branding to Retort. |
| .agentkit/templates/renovate/renovate.json | Renames dependency grouping description to Retort. |
| .agentkit/templates/language-instructions/README.md | Updates generator name references to Retort. |
| .agentkit/templates/headers/GENERATED.md | Updates standard generated header template to Retort. |
| .agentkit/templates/github/workflows/retrospective-quality.yml | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/github/workflows/pr-validation.yml | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/github/workflows/documentation-validation.yml | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/github/workflows/documentation-quality.yml | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/github/workflows/dependency-audit.yml | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/github/workflows/coverage-report.yml | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/github/workflows/breaking-change-detection.yml | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/github/scripts/setup-branch-protection.sh | Updates script branding and label description text to Retort. |
| .agentkit/templates/github/scripts/setup-branch-protection.ps1 | Updates script branding and label description text to Retort. |
| .agentkit/templates/github/scripts/resolve-merge.sh | Updates script branding/wording to Retort. |
| .agentkit/templates/github/scripts/resolve-merge.ps1 | Updates script branding/wording to Retort. |
| .agentkit/templates/github/scripts/README.md | Updates docs to Retort branding and regenerate command. |
| .agentkit/templates/github/CODEOWNERS | Updates generated header/comments to Retort branding. |
| .agentkit/templates/gemini/config.yaml | Updates generator attribution to Retort. |
| .agentkit/templates/docs/reference/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/reference/04_contributing.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/reference/03_changelog.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/reference/02_faq.md | Updates section titles and regenerate command to Retort. |
| .agentkit/templates/docs/reference/01_glossary.md | Updates terminology section (AgentKit Forge → Retort). |
| .agentkit/templates/docs/README.md | Updates docs hub template branding and regenerate command to Retort. |
| .agentkit/templates/docs/product/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/product/04_personas.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/product/03_roadmap.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/product/02_user_stories.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/product/01_prd.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/operations/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/operations/05_slos_slis.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/operations/04_troubleshooting.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/operations/03_incident_response.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/operations/02_monitoring.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/operations/01_deployment.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/integrations/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/integrations/03_sdk.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/integrations/02_webhooks.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/integrations/01_external_apis.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/history/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/07_changelog.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/06_pr_documentation.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/05_security.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/04_git_workflow.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/03_testing.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/02_coding_standards.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/engineering/01_setup.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/specs/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/specs/04_data_models.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/specs/03_api_spec.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/specs/02_technical_spec.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/specs/01_functional_spec.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/diagrams/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/decisions/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/decisions/06-code-quality-maintainability-signal-tooling.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/decisions/05-dependency-supply-chain-detection-tooling.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/decisions/04-static-security-analysis-depth-tooling.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/decisions/03-tooling-strategy.md | Updates generated header/regenerate command and ADR-01 reference text. |
| .agentkit/templates/docs/architecture/decisions/02-fallback-policy-tokens-problem.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/architecture/decisions/01-adopt-agentkit-forge.md | Updates ADR-01 content/commands to Retort branding. |
| .agentkit/templates/docs/architecture/01_overview.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/api/README.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/api/06_versioning.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/api/05_errors.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/api/04_examples.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/api/03_authentication.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/api/02_endpoints.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/docs/api/01_overview.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/cursor/teams/TEMPLATE.mdc | Updates generated-file guidance to Retort and retort:sync. |
| .agentkit/templates/cursor/rules/project-context.mdc | Updates framework name and generated-file guidance to Retort. |
| .agentkit/templates/cursor/commands/TEMPLATE.md | Updates lifecycle wording to Retort. |
| .agentkit/templates/copilot/prompts/TEMPLATE.prompt.md | Updates lifecycle wording to Retort. |
| .agentkit/templates/copilot/copilot-instructions.md | Updates framework name and sync guidance to Retort. |
| .agentkit/templates/copilot/agents/TEMPLATE.agent.md | Updates generated-file guidance to Retort and retort:sync. |
| .agentkit/templates/claude/state/schema.json | Updates schema title branding to Retort. |
| .agentkit/templates/claude/rules/typescript.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/testing.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/template-protection.md | Updates wording/commands to Retort. |
| .agentkit/templates/claude/rules/security.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/rust.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/quality.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/python.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/iac.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/git-workflow.md | Updates generated-file guidance to Retort and retort:sync. |
| .agentkit/templates/claude/rules/dotnet.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/documentation.md | Updates generated-file guidance to Retort and retort sync. |
| .agentkit/templates/claude/rules/dependency-management.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/ci-cd.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/blockchain.md | Updates generated header regenerate command to Retort. |
| .agentkit/templates/claude/rules/agent-conduct.md | Updates generated-file guidance to Retort and retort sync. |
| .agentkit/templates/claude/hooks/protect-templates.sh | Updates branding in header/comments; adjusts deny message (still needs cleanup). |
| .agentkit/templates/claude/hooks/protect-templates.ps1 | Updates branding in header/comments; adjusts deny message (still needs cleanup). |
| .agentkit/templates/claude/commands/validate.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/claude/commands/sync.md | Updates generated header/regenerate command and examples to Retort. |
| .agentkit/templates/claude/commands/start.md | Updates generated header/regenerate command and wording to Retort. |
| .agentkit/templates/claude/commands/review.md | Updates wording about generated files/templates to Retort. |
| .agentkit/templates/claude/commands/project-review.md | Updates wording about generated files/templates to Retort. |
| .agentkit/templates/claude/commands/feature-review.md | Updates wording to Retort branding. |
| .agentkit/templates/claude/commands/feature-configure.md | Updates wording to Retort branding. |
| .agentkit/templates/claude/commands/expand.md | Updates generated header/regenerate command to Retort. |
| .agentkit/templates/claude/commands/doctor.md | Updates wording to Retort branding. |
| .agentkit/templates/claude/commands/cost.md | Updates wording to Retort branding. |
| .agentkit/templates/claude/CLAUDE.md | Updates primary project context wording and sync guidance to Retort. |
| .agentkit/templates/ai/windsurfrules | Updates generated-file guidance and sync command to Retort. |
| .agentkit/templates/ai/cursorrules | Updates generated-file guidance and sync command to Retort. |
| .agentkit/templates/ai/continuerules | Updates generated-file guidance and sync command to Retort. |
| .agentkit/package.json | Renames runtime package and adds retort:* script aliases. |
| .agentkit/engines/node/src/weighted-scorer.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/validate.mjs | Updates branding and generated-header checks to include Retort. |
| .agentkit/engines/node/src/tracker-adapter.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/tool-manager.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/template-utils.mjs | Updates header branding and generated-header marker (sync command still needs adjustment). |
| .agentkit/engines/node/src/task-protocol.mjs | Updates branding and one error message to Retort. |
| .agentkit/engines/node/src/task-cli.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/sync-guard.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/sync-backlog-runner.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/suggestion-store.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/spec-validator.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/runner.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/review-runner.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/project-completeness.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/plan-runner.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/orchestrator.mjs | Updates file header branding and status banner to Retort. |
| .agentkit/engines/node/src/linear-adapter.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/issue-normalizer.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/init.mjs | Updates init wizard intro branding to Retort. |
| .agentkit/engines/node/src/import-issues.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/healthcheck.mjs | Updates branding in section header text to Retort. |
| .agentkit/engines/node/src/handoff.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/github-adapter.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/feature-manager.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/expansion-analyzer.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/events.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/event-emitter.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/doctor.mjs | Updates branding and merge-driver marker checks to Retort. |
| .agentkit/engines/node/src/discover.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/cost-tracker.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/cli.mjs | Updates CLI help/console prefixes to Retort. |
| .agentkit/engines/node/src/check.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/budget-guard.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/brand-resolver.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/backlog-viewer.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/backlog-store.mjs | Updates footer branding to Retort. |
| .agentkit/engines/node/src/agent-integration.mjs | Updates file header branding to Retort. |
| .agentkit/engines/node/src/agent-analysis.mjs | Updates generated text to Retort branding. |
| .agentkit/engines/node/src/tests/template-utils.test.mjs | Updates assertions for new Retort header marker. |
| .agentkit/engines/node/src/tests/cli.test.mjs | Updates CLI help/version assertions to Retort branding. |
| .agentkit/engines/node/src/tests/brand-resolver.test.mjs | Updates brand metadata expectation to Retort. |
Files not reviewed (4)
- .claude/worktrees/focused-colden/.agentkit/package-lock.json: Language not supported
- .claude/worktrees/focused-colden/package-lock.json: Language not supported
- .claude/worktrees/tender-margulis/.agentkit/package-lock.json: Language not supported
- .claude/worktrees/tender-margulis/package-lock.json: Language not supported
Comment on lines
678
to
685
| const pm = vars.packageManager || 'pnpm'; | ||
| const syncCmd = | ||
| pm === 'npm' ? 'npm run -C .agentkit agentkit:sync' : `${pm} -C .agentkit agentkit:sync`; | ||
| return [ | ||
| `${comment.start} GENERATED by AgentKit Forge v${version} — DO NOT EDIT${suffix}`, | ||
| `${comment.start} GENERATED by Retort v${version} — DO NOT EDIT${suffix}`, | ||
| `${comment.start} Source: .agentkit/spec + .agentkit/overlays/${repoName}${suffix}`, | ||
| `${comment.start} Regenerate: ${syncCmd}${suffix}`, | ||
| '', |
There was a problem hiding this comment.
getGeneratedHeader() now emits a "GENERATED by Retort" header, but the syncCmd it embeds still points to agentkit:sync. This will instruct users to run the wrong command and makes the header inconsistent with the new retort:sync scripts. Update syncCmd to use retort:sync (and keep a fallback/alias only if you intend to support both).
Comment on lines
719
to
723
| const header = getGeneratedHeader(version, repoName, ext); | ||
| if (!header) return content; // JSON / template — no comment syntax | ||
| if (content.includes('GENERATED by AgentKit Forge')) return content; // already present | ||
| if (content.includes('GENERATED by Retort')) return content; // already present | ||
|
|
||
| const normalizedExt = ext.toLowerCase(); |
There was a problem hiding this comment.
insertHeader() only checks for an existing GENERATED by Retort marker. During migration, files/templates that still contain GENERATED by AgentKit Forge will get a second header prepended, producing duplicated headers. Consider treating both the old and new markers as "already has header" to keep sync idempotent across upgrades.
| expect(header).toContain('GENERATED by AgentKit Forge v0.1.0'); | ||
| expect(header).toContain('GENERATED by Retort v0.1.0'); | ||
| expect(header).toContain('.agentkit/overlays/my-repo'); | ||
| expect(header).toContain('pnpm -C .agentkit agentkit:sync'); |
There was a problem hiding this comment.
The test still asserts that generated headers contain pnpm -C .agentkit agentkit:sync, but the PR is renaming the workflow to retort:sync. Once getGeneratedHeader() is corrected, this assertion should be updated to retort:sync (or allow either if backwards compatibility is intentional).
Suggested change
| expect(header).toContain('pnpm -C .agentkit agentkit:sync'); | |
| expect(header).toContain('pnpm -C .agentkit retort:sync'); |
Comment on lines
+4
to
6
| # Purpose: Block AI writes to Retort source files (templates, spec, | ||
| # engines, overlays) in DOWNSTREAM repos. In the agentkit-forge source | ||
| # repo itself, agents ARE the maintainers and need full access. |
There was a problem hiding this comment.
This hook template still refers to the "agentkit-forge source repo" and uses agentkit-forge-runtime as the detection mechanism. After renaming the runtime package to retort-runtime, this detection will no longer recognize the source repo correctly, and the hook may start blocking edits even in the upstream repo. Update the source-repo detection text/logic to match the new package/repo naming.
Comment on lines
49
to
51
| jq -n \ | ||
| --arg reason "Blocked: '${FILE_PATH}' is an AgentKit Forge source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run '{{packageManager}} -C .agentkit agentkit:sync'." \ | ||
| --arg reason "Blocked: '${FILE_PATH}' is an Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run '{{packageManager}} -C .agentkit retort:sync'." \ | ||
| '{ |
There was a problem hiding this comment.
The deny reason says "is an Retort source file" (grammar) and directs users to open a PR against the agentkit-forge repository. With the Retort rename, the guidance should point to the correct upstream (Retort) repo (or be phrased generically), and the article should be "a Retort source file".
Comment on lines
+3
to
5
| # Purpose: Block AI writes to Retort source files (templates, spec, | ||
| # engines, overlays) in DOWNSTREAM repos. In the agentkit-forge source | ||
| # repo itself, agents ARE the maintainers and need full access. |
There was a problem hiding this comment.
This hook template header still mentions "agentkit-forge source repo" in the Retort-branded version. After the rename, the source repo naming (and any related detection logic) should be updated to Retort to avoid confusing downstream users and maintainers.
Comment on lines
54
to
56
| if ($filePath -match $pattern) { | ||
| $reason = "Blocked: '$filePath' is an AgentKit Forge source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run 'pnpm -C .agentkit agentkit:sync'." | ||
| $reason = "Blocked: '$filePath' is an Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run 'pnpm -C .agentkit retort:sync'." | ||
| @{ |
There was a problem hiding this comment.
The deny reason says "is an Retort source file" (grammar) and directs users to open a PR against the agentkit-forge repository. With the Retort rename, this guidance should reference the correct upstream (or be made generic), and the article should be "a Retort source file".
Comment on lines
+1
to
+7
| { | ||
| "permissions": { | ||
| "allow": [ | ||
| "Bash(git ls-remote https://github.com/actions/checkout.git refs/tags/v4.2.2)", | ||
| "Bash(git ls-remote https://github.com/anthropics/claude-code-action.git refs/tags/v1)", | ||
| "Bash(git ls-remote https://github.com/actions/github-script.git refs/tags/v7)", | ||
| "Bash(pnpm -C .agentkit test)", |
There was a problem hiding this comment.
These .claude/worktrees/** files look like local Claude Code worktree state (permissions allowlist, cached commands, etc.) and are typically machine/user-specific. They shouldn’t be committed into the main repo; please remove the .claude/worktrees/ directory from version control and add it to .gitignore to prevent reintroducing local state/logs.
Comment on lines
+1
to
+12
| { | ||
| "schema_version": "1.0.0", | ||
| "repo_id": "JustAGhosT/retort", | ||
| "branch": "fix/generated-files-and-conflict-markers", | ||
| "session_id": "2026-03-15", | ||
| "current_phase": 2, | ||
| "phase_name": "Planning", | ||
| "last_phase_completed": 1, | ||
| "next_action": "Complete task-p0-test-framework (team-quality). Reassign P0 CI to DevOps. Then run Phase 4 Validation.", | ||
| "lastHealthcheck": "2026-03-15T13:10:00Z", | ||
| "healthStatus": "unhealthy", | ||
| "healthDetails": { |
There was a problem hiding this comment.
This file appears to be generated session/worktree state (.claude/state/orchestrator.json) under .claude/worktrees/**. Committing these ephemeral state snapshots will create noisy diffs and may leak environment-specific details (paths, branch names, local health results). Please remove .claude/worktrees/** from git and ignore it going forward.
JustAGhosT
added a commit
that referenced
this pull request
Mar 21, 2026
- Add `integrationBranch` field to overlay settings.yaml template
(defaults to defaultBranch, allows dev/main distinction)
- Add `overlays/retort/settings.yaml` — sets integrationBranch: dev
for retort's own generated output
- Add CLAUDE.md template section: Integration Branch header + PR Target
Branch subsection with correct `gh pr create --base` example
- Add synchronize.mjs mapping: `integrationBranch` var from overlay settings
- Add hookify rule template: claude/rules/pr-base-branch.md warns when
`gh pr create` is used without `--base {{integrationBranch}}`
- Regenerate all sync outputs with Retort branding and integrationBranch
This prevents the reverse-merge anti-pattern (PR targeting main instead
of dev) that triggered PR #437. The rule is enforced at the framework
level — every onboarded repo gets the guard baked into its CLAUDE.md and
.claude/rules/pr-base-branch.md automatically.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
5 tasks
JustAGhosT
added a commit
that referenced
this pull request
Mar 21, 2026
…438) * feat(config): add integrationBranch setting and PR base branch guard - Add `integrationBranch` field to overlay settings.yaml template (defaults to defaultBranch, allows dev/main distinction) - Add `overlays/retort/settings.yaml` — sets integrationBranch: dev for retort's own generated output - Add CLAUDE.md template section: Integration Branch header + PR Target Branch subsection with correct `gh pr create --base` example - Add synchronize.mjs mapping: `integrationBranch` var from overlay settings - Add hookify rule template: claude/rules/pr-base-branch.md warns when `gh pr create` is used without `--base {{integrationBranch}}` - Regenerate all sync outputs with Retort branding and integrationBranch This prevents the reverse-merge anti-pattern (PR targeting main instead of dev) that triggered PR #437. The rule is enforced at the framework level — every onboarded repo gets the guard baked into its CLAUDE.md and .claude/rules/pr-base-branch.md automatically. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(pr-review): address four Copilot review comments on PR #438 1. template-utils.mjs syncCmd: 'agentkit:sync' → 'retort:sync' in the generated GENERATED header's Regenerate instruction (line 680) 2. template-utils.mjs insertHeader: treat legacy 'GENERATED by AgentKit Forge' marker as "already present" to prevent double-headers during transition (line 721) 3. protect-templates.sh/.ps1: "is an Retort source file" → "is a Retort source file" (grammar fix, line 50) 4. review.md / project-review.md: "an Retort template" → "a Retort template" (grammar fix, line 239) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Brief description of what this PR does and why.
Closes #
Changes
Test Plan
Describe how you tested these changes:
Validation Commands
# Commands to verify this change works correctlyChecklist
npm test/cargo test/ equivalent)Documentation
Change Impact
Documentation Checklist (required for High impact)
./scripts/create-doc.sh <type> "<title>" <pr>[bracketed]placeholder sections filled indocs/history/subdirectory.index.jsonCHANGELOG.mdupdated (auto-updated bycreate-doc.sh, or run./scripts/update-changelog.sh)